merge trunk
authorK. Handa <handa@gnu.org>
Fri, 10 Jan 2014 23:26:10 +0000 (08:26 +0900)
committerK. Handa <handa@gnu.org>
Fri, 10 Jan 2014 23:26:10 +0000 (08:26 +0900)

Trivial merge